Fix the x86/64 build.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/linux-2.6-xen-sparse/arch/xen/i386/kernel/time.c b/linux-2.6-xen-sparse/arch/xen/i386/kernel/time.c
index 0cbdb6d5f7aee7cfa13fcae22692b52a3b009c22..9925dc98433d0d09eb081ce3281a38862a0daacc 100644 (file)
--- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/time.c
+++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/time.c
@@ -181,15 +181,15 @@ static inline u64 scale_delta(u64 delta, u32 mul_frac, int shift)
                delta <<= shift;
 
        __asm__ (
-               "pushl %%edx    ; "
-               "mull  %3       ; "
-               "popl  %%eax    ; "
-               "pushl %%edx    ; "
-               "mull  %3       ; "
-               "popl  %3       ; "
-               "addl  %3,%%eax ; "
-               "xorl  %3,%3    ; "
-               "adcl  %3,%%edx ; "
+               "push %%edx    ; "
+               "mul  %3       ; "
+               "pop  %%eax    ; "
+               "push %%edx    ; "
+               "mul  %3       ; "
+               "pop  %3       ; "
+               "add  %3,%%eax ; "
+               "xor  %3,%3    ; "
+               "adc  %3,%%edx ; "
                : "=A" (product), "=r" (tmp)
                : "A" (delta), "1" (mul_frac) );
 

diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c
index a29867e6a1f70fd1cd4fd5e4b475c7ef98962801..0d13382aba7f305c5c29639fcb717a6a969c3a36 100644 (file)
--- a/xen/arch/x86/time.c
+++ b/xen/arch/x86/time.c
@@ -111,15 +111,15 @@ static inline u64 scale_delta(u64 delta, struct time_scale *scale)
         delta <<= scale->shift;
 
     __asm__ (
-        "pushl %%edx    ; "
-        "mull  %3       ; "
-        "popl  %%eax    ; "
-        "pushl %%edx    ; "
-        "mull  %3       ; "
-        "popl  %3       ; "
-        "addl  %3,%%eax ; "
-        "xorl  %3,%3    ; "
-        "adcl  %3,%%edx ; "
+        "push %%edx    ; "
+        "mul  %3       ; "
+        "pop  %%eax    ; "
+        "push %%edx    ; "
+        "mul  %3       ; "
+        "pop  %3       ; "
+        "add  %3,%%eax ; "
+        "xor  %3,%3    ; "
+        "adc  %3,%%edx ; "
         : "=A" (product), "=r" (tmp)
         : "A" (delta), "1" (scale->mul_frac) );